Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ticket/16904] Fix regression in MCP for topics selection #6323

Merged
merged 4 commits into from Nov 30, 2021
Merged

[ticket/16904] Fix regression in MCP for topics selection #6323

merged 4 commits into from Nov 30, 2021

Conversation

rxu
Copy link
Contributor

@rxu rxu commented Nov 2, 2021 •
edited

Regression was introduced in #5760.

Checklist:

  • Correct branch: master for new features; 3.3.x for fixes
  • Refactor MCP tests
  • Tests pass
  • Code follows coding guidelines: master and 3.3.x
  • Commit follows commit message format

PHPBB3-16904.

@rxu rxu changed the base branch from master to 3.3.x November 2, 2021 06:58
@rxu
Copy link
Contributor Author

rxu commented Nov 2, 2021 •
edited

Currently this PR also changes behavior of function phpbb_extra_url() so that its resulting string is not being prepended with &.

@rxu rxu force-pushed the ticket/16904 branch 15 times, most recently from 1b98b67 to 8737cc0 Compare November 4, 2021 17:49
@rxu rxu force-pushed the ticket/16904 branch 11 times, most recently from 3793d3a to 2545791 Compare November 5, 2021 11:47
@rxu rxu force-pushed the ticket/16904 branch 8 times, most recently from 8ccd61f to 4c38533 Compare November 5, 2021 15:30
@rxu rxu marked this pull request as ready for review November 6, 2021 04:36
marc1706
marc1706 requested changes Nov 7, 2021
View reviewed changes
tests/functional/mcp/mcp_main_test.php Outdated Show resolved Hide resolved
tests/functional/mcp/mcp_main_test.php Outdated Show resolved Hide resolved
tests/functional/mcp/mcp_main_test.php Outdated Show resolved Hide resolved
tests/functional/mcp/mcp_main_test.php Outdated Show resolved Hide resolved
tests/functional/mcp/mcp_main_test.php Outdated Show resolved Hide resolved
tests/functional/mcp/mcp_test.php Outdated Show resolved Hide resolved
@marc1706 marc1706 added this to the 3.3.6 milestone Nov 7, 2021
@rxu rxu force-pushed the ticket/16904 branch 4 times, most recently from f01d9b1 to fd80d03 Compare November 7, 2021 12:28
@rxu rxu requested a review from marc1706 November 7, 2021 14:14
marc1706 added a commit to marc1706/phpbb that referenced this pull request Nov 23, 2021
@marc1706
Merge pull request phpbb#6323 from rxu/ticket/16904
8106c41 
[ticket/16904] Fix regression in MCP for topics selection
@marc1706
Copy link
Member

@rxu could you create a PR to resolve the merge conflicts with master? right now it does not properly merge into master and I won't have time to have a look until beginning of next week.

@rxu rxu mentioned this pull request Nov 24, 2021
Merged
4 tasks
@rxu
Copy link
Contributor Author

rxu commented Nov 24, 2021 •
edited

@marc1706 Done. I've changed the last commit in #6333 though so don't know if it's correct now.

@marc1706 marc1706 merged commit 534cef9 into phpbb:3.3.x Nov 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marc1706 marc1706 marc1706 approved these changes

@CHItA CHItA CHItA approved these changes

Assignees
No one assigned
Labels
3.3 (Proteus) 🌑
Projects
None yet
Milestone
3.3.6
3 participants
@rxu @marc1706 @CHItA